Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 17:14:04 +0000 (10:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 17:14:04 +0000 (10:14 -0700)

Trivial merge